merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 24 Nov 2010 01:55:49 +0000 (10:55 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 24 Nov 2010 01:55:49 +0000 (10:55 +0900)

Trivial merge